* net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4310dd5fe8c6c683abcbf21facc05e880d1bd04..10db215a98988d07e70f4ae0d675fb02925225e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-13  Romain Francoise  <romain@orebokech.com>
+
+       * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
        * subr.el (posn-col-row): Evaluate header-line-format in the

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 85c546ffd3fc5c779b93aaabd967fc33eea2ae55..e49af2948e69e253a72d2c885a719d5cbd10e874 100644 (file)
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -77,7 +77,7 @@ PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\".
 TRUSTFILES is a list of CA bundles.
 KEYFILES is a list of client keys."
   (let* ((type (or type 'gnutls-x509pki))
-         (trusfiles (or trustfiles
+         (trustfiles (or trustfiles
                         '("/etc/ssl/certs/ca-certificates.crt")))
          (priority-string (or priority-string
                               (cond